Make sure that --root works for toplevel widgets. (#491847, Phil Lello)

2008-01-06  Johan Dahlin  <johan@gnome.org>

	* gtk/gtk-builder-convert (GtkBuilderConverter._strip_root):
	Make sure that --root works for toplevel widgets.
	(#491847, Phil Lello)

svn path=/trunk/; revision=19309

diff --git a/ChangeLog b/ChangeLog
index 01a7214ffaf66db8a423c9d2b231eab0b981b78e..019bcb0e6815901b4c8cee071dab239a589d7ceb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-06  Johan Dahlin  <johan@gnome.org>
+
+       * gtk/gtk-builder-convert (GtkBuilderConverter._strip_root): 
+       Make sure that --root works for toplevel widgets.
+       (#491847, Phil Lello)
+
 2008-01-05  Johan Dahlin  <johan@gnome.org>
 
        * modules/other/gail/tests/Makefile.am: Include Makefile.decl,

diff --git a/gtk/gtk-builder-convert b/gtk/gtk-builder-convert
index f2a94098a5fc8dfce6e3ab10fc38c56b294020b9..8e5d0892a252875b90a67abad12ab289bd902b54 100755 (executable)
--- a/gtk/gtk-builder-convert
+++ b/gtk/gtk-builder-convert
@@ -597,16 +597,11 @@ class GtkBuilderConverter(object):
             raise SystemExit("Could not find an object called `%s'" % (
                 root_name))
 
-        # If it's already a root object, don't do anything
-        if widget.parentNode is self._interface:
-            return
-
         for child in self._interface.childNodes[:]:
             if child.nodeType != Node.ELEMENT_NODE:
                 continue
             child.parentNode.removeChild(child)
 
-        widget.parentNode.removeChild(widget)
         self._interface.appendChild(widget)